merge from trunk

diff --cc configure.ac
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
index 86e5aca36ecd6574bf966dd7b77a5f3c9daccefd,90083eb910fdd8763dbe4eea36f9ca3889ab08d9..9ad425674f34c133a5127d1b2fb8c0ac89a5f35b
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -370,9 -375,8 +375,9 @@@ base_obj = dispnew.o frame.o scroll.o x
        region-cache.o sound.o atimer.o \
        doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
        profiler.o \
 +      thread.o systhread.o \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
-       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ)
+       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
  obj = $(base_obj) $(NS_OBJC_OBJ)
  
  ## Object files used on some machine or other.

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/process.c
index c1726e7ad601c427ee4f9831bfb932befd46b180,a873dd0cdb2ba528248d4821f64308f31d29d070..17facf567b883eebf2ccee1d0b99ad46264e9017
--- 1/src/process.c
--- 2/src/process.c
+++ b/src/process.c
@@@ -4692,18 -4527,18 +4692,18 @@@ wait_reading_process_output (intmax_t t
              process_output_skip = 0;
            }
  #endif
 -
 +        nfds = thread_select (
- #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
-                               xg_select
- #elif defined (HAVE_NS)
+ #if defined (HAVE_NS)
 -          nfds = ns_select
 +                              ns_select
+ #elif defined (HAVE_GLIB)
 -        nfds = xg_select
++                              xg_select
  #else
 -        nfds = pselect
 +                              pselect
  #endif
 -            (max (max_process_desc, max_input_desc) + 1,
 -             &Available,
 -             (check_write ? &Writeok : (SELECT_TYPE *)0),
 -             NULL, &timeout, NULL);
 +                              , max_desc + 1,
 +                              &Available,
 +                              (check_write ? &Writeok : (SELECT_TYPE *)0),
 +                              NULL, &timeout, NULL);
  
  #ifdef HAVE_GNUTLS
            /* GnuTLS buffers data internally.  In lowat mode it leaves

diff --cc src/process.h
index cf1e0ea1d4432f14dd7670192de3b784876e6384,0c4e17e68cff764baf4d6f3b81aa86891886e844..389944610291f7f61769e694b176bc8de84bbd44
--- 1/src/process.h
--- 2/src/process.h
+++ b/src/process.h
@@@ -220,8 -217,8 +220,10 @@@ extern void add_read_fd (int fd, fd_cal
  extern void delete_read_fd (int fd);
  extern void add_write_fd (int fd, fd_callback func, void *data);
  extern void delete_write_fd (int fd);
+ #ifdef NS_IMPL_GNUSTEP
  extern void catch_child_signal (void);
+ #endif
  
 +extern void update_processes_for_thread_death (Lisp_Object);
 +
  INLINE_HEADER_END

diff --cc src/window.c
Simple merge